This is labeled as a WIP, so I'll check back again when it's ready for final review. Everything seems reasonable though. My only high level comment is that this is three different tickets of work, and that it would be better to deliver as different PRs as well (less risk, easier to track down changes, faster user feedback, etc.)

5 different minor changes flagged here, mostly small styling notes. the first one is the largest as once the modals are 95% for all component editing views it might require testing / review of all the other modals before final merge.

Small question on some commented code, but otherwise LGTM. Please squash and add some context from the JIRA ticket into the commit message (what was done at a feature level and why), and let's merge. 😄